ostree: Some header file cleanups

diff --git a/src/ostree/ot-builtin-cat.c b/src/ostree/ot-builtin-cat.c
index 3169e49ab4e4c384fadcc0286779ecf3b488a40d..4650ee46dcba28917d51851db4b249b7b19d412d 100644 (file)
--- a/src/ostree/ot-builtin-cat.c
+++ b/src/ostree/ot-builtin-cat.c
@@ -24,10 +24,8 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
-#include "ostree-repo-file.h"
 
 #include <gio/gunixoutputstream.h>
-#include <glib/gi18n.h>
 
 static GOptionEntry options[] = {
 };

diff --git a/src/ostree/ot-builtin-checkout.c b/src/ostree/ot-builtin-checkout.c
index 25433af14bb31e308345e7fba9aa42bcce8c2a46..e2ada0719dfa81d9821856bc985fbb5f5a23b2d8 100644 (file)
--- a/src/ostree/ot-builtin-checkout.c
+++ b/src/ostree/ot-builtin-checkout.c
@@ -27,8 +27,6 @@
 
 #include <gio/gunixinputstream.h>
 
-#include <glib/gi18n.h>
-
 static gboolean opt_user_mode;
 static gboolean opt_allow_noent;
 static char *opt_subpath;

diff --git a/src/ostree/ot-builtin-checksum.c b/src/ostree/ot-builtin-checksum.c
index 150a24f1cfca9cf8fa3d3319807692b30ed74c0d..89dc4abe30c1f74635eeb9e47802428c5b4207ab 100644 (file)
--- a/src/ostree/ot-builtin-checksum.c
+++ b/src/ostree/ot-builtin-checksum.c
@@ -25,8 +25,6 @@
 #include "ot-builtins.h"
 #include "ostree.h"
 
-#include <glib/gi18n.h>
-
 static GOptionEntry options[] = {
   { NULL }
 };

diff --git a/src/ostree/ot-builtin-commit.c b/src/ostree/ot-builtin-commit.c
index b79a3a35f7b1bb41a60469dc9fd30a6e9a764e19..805dfcd78d4fdb093d17176cf370c2dc7bed3599 100644 (file)
--- a/src/ostree/ot-builtin-commit.c
+++ b/src/ostree/ot-builtin-commit.c
@@ -25,10 +25,6 @@
 #include "ot-builtins.h"
 #include "ostree.h"
 
-#include <gio/gunixoutputstream.h>
-
-#include <glib/gi18n.h>
-
 static char *metadata_text_path;
 static char *metadata_bin_path;
 static char *subject;

diff --git a/src/ostree/ot-builtin-config.c b/src/ostree/ot-builtin-config.c
index 2165b0c7d60e90251e1be228025cf5098e32f7bf..28c26dd11bc7430e92d9c5813a2e4902a36a78b3 100644 (file)
--- a/src/ostree/ot-builtin-config.c
+++ b/src/ostree/ot-builtin-config.c
@@ -25,8 +25,6 @@
 #include "ot-builtins.h"
 #include "ostree.h"
 
-#include <glib/gi18n.h>
-
 static GOptionEntry options[] = {
   { NULL }
 };

diff --git a/src/ostree/ot-builtin-diff.c b/src/ostree/ot-builtin-diff.c
index 9c091d728921a2a1901758065de8ec4ec54ca07d..484f036914f45f7cd587a59ab1f6f12e502ad473 100644 (file)
--- a/src/ostree/ot-builtin-diff.c
+++ b/src/ostree/ot-builtin-diff.c
@@ -25,8 +25,6 @@
 #include "ot-builtins.h"
 #include "ostree.h"
 
-#include <glib/gi18n.h>
-
 static GOptionEntry options[] = {
   { NULL }
 };

diff --git a/src/ostree/ot-builtin-fsck.c b/src/ostree/ot-builtin-fsck.c
index 65dd70b37c0ac2f3b97cdc49b2c921b061b03b2e..fe2b6dfb65a8dbce176dc140a9eab43c20714cbd 100644 (file)
--- a/src/ostree/ot-builtin-fsck.c
+++ b/src/ostree/ot-builtin-fsck.c
@@ -25,9 +25,6 @@
 #include "ot-builtins.h"
 #include "ostree.h"
 
-#include <glib/gi18n.h>
-#include <glib/gprintf.h>
-
 static gboolean quiet;
 static gboolean delete;
 

diff --git a/src/ostree/ot-builtin-init.c b/src/ostree/ot-builtin-init.c
index 08cf222dae53090a036fbf48f89c13e05a6b08a2..add3aab29030a01e208d2587f93fc0056fd5d945 100644 (file)
--- a/src/ostree/ot-builtin-init.c
+++ b/src/ostree/ot-builtin-init.c
@@ -25,8 +25,6 @@
 #include "ot-builtins.h"
 #include "ostree.h"
 
-#include <glib/gi18n.h>
-
 static gboolean opt_archive;
 static char *opt_mode = NULL;
 

diff --git a/src/ostree/ot-builtin-log.c b/src/ostree/ot-builtin-log.c
index ebc30e11c5a2801edcbb59eacf1a977f3fec5d9e..638cec808bb40a4bf21e09c0404ac2d7564c767d 100644 (file)
--- a/src/ostree/ot-builtin-log.c
+++ b/src/ostree/ot-builtin-log.c
@@ -25,8 +25,6 @@
 #include "ot-builtins.h"
 #include "ostree.h"
 
-#include <glib/gi18n.h>
-
 static GOptionEntry options[] = {
   { NULL }
 };

diff --git a/src/ostree/ot-builtin-ls.c b/src/ostree/ot-builtin-ls.c
index 4e08181d0d28e1cbf47c4034c1b989d3b6315097..333d9566e58dfb53adb7a584ea0272f613ac93df 100644 (file)
--- a/src/ostree/ot-builtin-ls.c
+++ b/src/ostree/ot-builtin-ls.c
@@ -26,8 +26,6 @@
 #include "ostree.h"
 #include "ostree-repo-file.h"
 
-#include <glib/gi18n.h>
-
 static gboolean recursive;
 static gboolean checksum;
 static gboolean xattrs;

diff --git a/src/ostree/ot-builtin-prune.c b/src/ostree/ot-builtin-prune.c
index 3c0a68c7a8b380eed1e602d6151f8dc046e64044..be22f4c191a09afae2ec9fbc3334f3015736cbf2 100644 (file)
--- a/src/ostree/ot-builtin-prune.c
+++ b/src/ostree/ot-builtin-prune.c
@@ -25,9 +25,6 @@
 #include "ot-builtins.h"
 #include "ostree.h"
 
-#include <glib/gi18n.h>
-#include <glib/gprintf.h>
-
 static gboolean opt_no_prune;
 static gint opt_depth = -1;
 static gboolean opt_refs_only;

diff --git a/src/ostree/ot-builtin-pull-local.c b/src/ostree/ot-builtin-pull-local.c
index 9a8cdfa3c1d74a1233ab4d7ac5c8dbe4d36ef4d9..da5374ed4495426586a530045b7703122ce0b8bb 100644 (file)
--- a/src/ostree/ot-builtin-pull-local.c
+++ b/src/ostree/ot-builtin-pull-local.c
@@ -22,12 +22,12 @@
 
 #include "config.h"
 
-#include "ot-builtins.h"
-#include "ostree.h"
-
 #include <unistd.h>
 #include <stdlib.h>
 
+#include "ot-builtins.h"
+#include "ostree.h"
+
 static char *opt_remote;
 
 static GOptionEntry options[] = {

diff --git a/src/ostree/ot-builtin-pull.c b/src/ostree/ot-builtin-pull.c
index a3aa73ba7908c000ffe2b2ade6bfcf4f18492fd8..5753cd87b850765d1fdbac63c9607b53bb41fac4 100644 (file)
--- a/src/ostree/ot-builtin-pull.c
+++ b/src/ostree/ot-builtin-pull.c
@@ -24,10 +24,6 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
-#include "ostree-repo-file.h"
-
-#include <gio/gunixoutputstream.h>
-#include <glib/gi18n.h>
 
 gboolean opt_related;
 

diff --git a/src/ostree/ot-builtin-refs.c b/src/ostree/ot-builtin-refs.c
index 3164604deb7b30a415156b5b100417dd5c0022b7..0c8c751f90f8f66e727d113c597359123eff2a27 100644 (file)
--- a/src/ostree/ot-builtin-refs.c
+++ b/src/ostree/ot-builtin-refs.c
@@ -24,7 +24,6 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
-#include "ostree-repo-file.h"
 
 static gboolean opt_delete;
 

diff --git a/src/ostree/ot-builtin-remote.c b/src/ostree/ot-builtin-remote.c
index 6039862751ae0acef3f2db36318159bee9928d9d..16ecbea1179083f5aaefbea67ecde91be640dba2 100644 (file)
--- a/src/ostree/ot-builtin-remote.c
+++ b/src/ostree/ot-builtin-remote.c
@@ -25,8 +25,6 @@
 #include "ot-builtins.h"
 #include "ostree.h"
 
-#include <glib/gi18n.h>
-
 static GOptionEntry options[] = {
   { NULL }
 };

diff --git a/src/ostree/ot-builtin-rev-parse.c b/src/ostree/ot-builtin-rev-parse.c
index e864c7cfd5d3ec01d80ac575e65812208a9e5282..c29172cda99f4bd16f8bc65aaaef4c6c1d1006ec 100644 (file)
--- a/src/ostree/ot-builtin-rev-parse.c
+++ b/src/ostree/ot-builtin-rev-parse.c
@@ -25,8 +25,6 @@
 #include "ot-builtins.h"
 #include "ostree.h"
 
-#include <glib/gi18n.h>
-
 static GOptionEntry options[] = {
   { NULL }
 };

diff --git a/src/ostree/ot-builtin-show.c b/src/ostree/ot-builtin-show.c
index b323cc3e6c57f20014320819de2d906edcdfdd4c..543672ff021d4cc5138d911759a0ed4a2885aaae 100644 (file)
--- a/src/ostree/ot-builtin-show.c
+++ b/src/ostree/ot-builtin-show.c
@@ -25,8 +25,6 @@
 #include "ot-builtins.h"
 #include "ostree.h"
 
-#include <glib/gi18n.h>
-
 static gboolean print_related;
 static char* print_variant_type;
 static char* print_metadata_key;

diff --git a/src/ostree/ot-builtin-trivial-httpd.c b/src/ostree/ot-builtin-trivial-httpd.c
index 83484fc94597367a2e0142274fdcfc1304cc4a87..ac11c72e45be6f9c091a3aa39fd35a6bad374c09 100644 (file)
--- a/src/ostree/ot-builtin-trivial-httpd.c
+++ b/src/ostree/ot-builtin-trivial-httpd.c
@@ -23,13 +23,7 @@
 #include <libsoup/soup.h>
 
 #include "ot-builtins.h"
-#include "ot-admin-builtins.h"
-#include "ot-admin-functions.h"
-#include "ot-main.h"
 #include "ostree.h"
-#include "ostree-repo-file.h"
-
-#include <glib/gi18n.h>
 
 static char *opt_port_file = NULL;
 static gboolean opt_daemonize;

diff --git a/src/ostree/ot-builtin-write-refs.c b/src/ostree/ot-builtin-write-refs.c
index 6422b3c676c75e16bed5451e9cf59b47624b2ea7..01185d8d61479b0547add6e8d9eebad5ab5c1d7c 100644 (file)
--- a/src/ostree/ot-builtin-write-refs.c
+++ b/src/ostree/ot-builtin-write-refs.c
@@ -28,8 +28,6 @@
 #include <gio/gunixoutputstream.h>
 #include <gio/gunixinputstream.h>
 
-#include <glib/gi18n.h>
-
 static GOptionEntry options[] = {
   { NULL }
 };